bootstrap ui connected
clean up things
Merge branch 'master' of github.com:fupslot/kobyran-shop

Conflicts:
	public/js/common/controllers/mainMenu.ctrl.js