Progress on frontend
Merge branch 'origin/develop'

Conflicts:
	views/index.jade