Update README.md
Merge branch 'develop'
Merge branch 'develop'
add footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/main.blade.php
	public/js/app-1394353632903.js
	public/js/app.js