work on adressen page
Merge branch 'master' of github.com:chioshinu/praxis

Conflicts:
	sites/all/themes/praxis/template.php