Added JS assets and Bootstrap
Removed unneccessary script tags in story
Merge remote-tracking branch 'origin/master'

Conflicts:
	NewsHackProject/grails-app/views/sample/index.gsp