moved files, added vendor libraries
Merge branch 'master' of github.com:octophpus/octophpus

Conflicts:
	app/vendor/bootstrap-theme.min.css
	app/vendor/bootstrap.license.txt
	app/vendor/bootstrap.min.css
	app/vendor/bootstrap.min.js