Merge remote-tracking branch 'origin/master'

Conflicts:
	profile.php
Merge branch 'master' of https://github.com/justinmurphy92/TZ
Merge branch 'master' of https://github.com/justinmurphy92/TZ
dunno what broke, but its fixed
Merge branch 'master' of https://github.com/justinmurphy92/TZ