Merged small updates which take care of some bootstrap transition problems, added templates to the grunt watch list

...ection manager introduces by new bootstrap version and added template changes to the grunt watch list