#21 Working on layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/web/js/index.js