Bundles
Merge branch 'master' of https://github.com/clubit/ibase_poc

Conflicts:
	app/scripts/app.js