Revert "removed bootstrap js"

This reverts commit 373281178d776646790b07c8916fffd6d09855f1.
Merge branch 'master' of https://github.com/riaworks/Heracles

Conflicts:
	assets/app/main.js