before merging with on-site changes...
Merge branch 'master' of https://github.com/Guest007/eurocard
Merge branch 'master' of https://github.com/Guest007/eurocard
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/home.html
	templates/home1.html
	theme/js/init.js