fixed controller
Merge branch 'master' of github.com:brain4rent/db3

Conflicts:
	client/app.js
	client/splatter.css