synchronizace s jardou
Merge branch 'master' of github.com:ladesopeklo/cmsClientPhp

Conflicts:
	Scripts/class.apiWrapper.js
	Scripts/controller.galleryImage.js
	Scripts/directive.ngcResponsiveImage.js
	Scripts/directive.ngcSimpleDrag.js
	Scripts/module.defaultClient.js
	Service/cmsClientPHPService
	index.html
	template.page.html