Bootstrap design template added
Merge branch 'master' of https://github.com/MediaDock/MediaDock

Conflicts:
	app.js