Merge branch 'master' of https://github.com/TeamDionysus/End-to-end-JS-Apps-Teamwork

Conflicts:
	public/app/app.js
	server/views/includes/scripts.jade
	server/views/index.jades
user avatar upload (not working)
Merge branch 'master' of https://github.com/TeamDionysus/End-to-end-JS-Apps-Teamwork

Conflicts:
	server/controllers/index.js