Merge branch 'bootstrap3' of https://github.com/teamoo/musiccrawlerweb into bootstrap3

Conflicts:
	client/admin.html