testy
Merge branch 'master' of https://github.com/ladesopeklo/weby

Conflicts:
	masp/.idea/workspace.xml
	masp/maspNew/Scripts/angular-resource.js
	masp/maspNew/Scripts/module.apiModule.js
	masp/maspNew/index.html
	masp/maspNew/tests/e2e/SpecRunner.html
php
960 masparti-responsive