Merge remote-tracking branch 'origin/Mic' into Charlie

Conflicts:
	main/index.php
Merge branch 'Mic' into Charlie
Updated some of the SQL queries to add columns from other tables so don't have to create a new object User or Base for every ID => less database queries.
A user on a base page will update time of view in user_base table.
Merge remote-tracking branch 'origin/master' into Charlie

Conflicts:
	main/html/user-profile.html
	main/index.php
	main/js/script.js