add controllers
Merge branch 'dev' into 651CrContr

Conflicts:
	app/assets/stylesheets/community.css.scss
Merge pull request #7 from is-valid/651CrContr

add controllers