Sync
Merge branch 'master' of https://github.com/jamesfebin/Boutline

Conflicts:
	bootstrap/js/timeline/scriptgates.js