fixed page layouts
Merge commit 'da325294450f7edd342c76fc29afb6eab244ec2c' into developerCorbin

Conflicts:
	platforms/android/assets/www/css/app.css
	platforms/android/assets/www/js/controllers.js
	platforms/android/assets/www/partials/questions3.html
	www/partials/layoutPage.html
Merge remote-tracking branch 'origin/developerCorbin' into gabys_branch

Conflicts:
	www/partials/layoutPage.html
	www/partials/questions.first.html