Work on homepage/general css and javascript
Merge remote-tracking branch 'origin/master'

Conflicts:
	Admin/index.php
	Tech/index.php