Corrected silly footer bug
Upgraded to newest bootstrap and fontawesome. Fixed icons
broke dropdown menu
broke dropdown menu
possibly fixed nav html
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/static/footer.php
possibly fixed nav html
possibly fixed nav html