Update many things
Merge branch 'master' of https://github.com/lordfelipe/mmn.git

Conflicts:
	mmn/app.js
	mmn/public/javascripts/app.js
	mmn/public/stylesheets/style.css
	mmn/views/index.jade
	mmn/views/layout.jade
	mmn/views/member-report.jade