Layout
Merge branch 'develop' of https://github.com/andredyl/JS-App_FH2013 into develop

Conflicts:
	fhkielapp/views/subject/enroll.ejs