Merged remove SmashApplication branch to master