Added prevent default
Merge branch 'master' into starting-point

Conflicts:
	app/views/pages/show.html.erb
	lib/assets/javascripts/angular/_ng_module.js