Code cleanup.removed unwanted logic from the code
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers.js