fix
Merge branch 'feature/bootstrap3' of https://github.com/ec3s/angular-adminui into feature/bootstrap3

Conflicts:
	app/views/form.html