Merge remote-tracking branch 'origin/developerCorbin' into gabys_branch

Conflicts:
	www/css/app.css
	www/partials/questions.first.html
pen icon shows and hides options... sub tabs added to json's...
bottom tabs are functional now.  not 100% done, but they are loading the different sets of questions.
fixed some weird occurrences with the questions
made tab labels show up...needs css to make it look not lame
.
new grid/new graphics/animation