Changes to Account Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/templates/tab-account.html
	www/templates/tab-dash.html
 Changes to Account page [axof:181]
Merge branch 'cait-4' of https://github.com/russblackburn/Textbook-App into ryan-database