customizing modal close based on  flag
Merge branch 'fixing-modal' of https://github.com/infowrap/bootstrap

Conflicts:
	bower.json