[fix] cosmetic changes
[add] cosmetic changes
Merge branch 'develop' of https://github.com/Schosser/MasterLabProject09_2013 into develop

Conflicts:
	website/public/js/timeline.js