forum begin
Merge branch 'develop' of https://github.com/42Zavattas/intra into develop

Conflicts:
	app/scripts/app.js
	app/views/index.html
	app/views/partials/nav.html
	lib/config/dummydata.js