ADDED VIEW 4
Merge origin/futureBranch2014 into futureBranch2014

Conflicts:
	HTML5Application/app/js/app.js