added changes in local
Merge remote-tracking branch 'origin/futureBranch2014' into futureBranch2014

Conflicts:
	HTML5Application/app/partials/partial1.html