Changed version of bootstrap and bootswatch
Merge branch 'fs/bootswatch' into dev

Conflicts:
	bower.json