main controller updated
Merge branch 'master' into design

Conflicts:
	client/app/main/main.html