add
Merge branch 'master' of github.com:sorrymeika/PhotoPrintApp

Conflicts:
	assets/js/sl/sl.js
	assets/js/sl/widget/loading.js
	assets/js/views/login.js
	assets/js/views/menu.js
	assets/js/views/user.js
	assets/views/login.html
	assets/views/user.html