lv
Merge branch 'master' of https://github.com/dgordienko/angular_test

Conflicts:
	.idea/workspace.xml
	public/js/controllers.js
angular strap select item injected
angular strap select item injected
angular strap select item injected