Merge branch 'master' of http://github.com/Wysie/development_apps_spareparts into HEAD