reads from json, has an abstract questions state, camera...
looks ugly but everything works so far...when question tabs are clicked, they move the icons away...but theyre still there
working app with layout module and json files; looks ugly though bc css isnt updated
Merge branch 'master' into gabys_branch

Conflicts:
	www/img/calendar.png
	www/partials/camera.html
	www/partials/questions.summary.html
no message
no message
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