added controller to each partial
Merge remote-tracking branch 'origin/master'

Conflicts:
	samples/bower.json
Added bower package file