Merge branch 'hotfix/Navhelper'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
some xml stuff
new git ignor
Added the Adzoneselements
Some litte things
Fort hässig
Test for hässig use
Merge branch 'feature/style_swag' into develop

Conflicts:
	app/View/Elements/footer.ctp
Merge branch 'elements'
New DB config yo dont need anymore your local DB!
Merge branch 'develop'
Routes AJAX and LESS fixes and add's
Some changes in the register side
Merge branch 'develop'
Try out less
Merge branch 'develop'