shri
Merge branch 'master' of https://github.com/prav82c/tixboxdev
shri
Merge branch 'master' of https://github.com/prav82c/tixboxdev
shri
Merge branch 'master' of https://github.com/prav82c/tixboxdev

Conflicts:
	customer-app/profile-edit.html