add chosen files
add angularjs
remove input_html for easier mergeing
Merge branch 'angularjs' into feature-facebook-login

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js