fx
Merge branch 'master' of github.com:sorrymeika/PhotoPrint

Conflicts:
	XX_PhotoPrint/Views/Shared/_Header.cshtml
	XX_PhotoPrint/js/sl/tmpl.js
	XX_PhotoPrint/theme/style.css