add active & click
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts_js/hashtag.js
	app/scripts_js/hello.js
	app/scripts_js/main.js
	app/scripts_js/serverConnector.js
	app/scripts_js/user.js
	app/scripts_js/users.js
add scripts_js to ignore