fixed bootstrap core js links
Woohoo! Moar content!
rearranged some js links
Merge branch 'develop'

Conflicts:
	index.html