Updates

- Re-organized Files (include in index.php)
- included font-aweome
Merge remote-tracking branch 'origin/master'

Conflicts:
	html/compare.html
	html/content/sites/login.php
	html/css/app.css