Merge branch 'hotfix/Navhelper'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Some litte changes
Friststep done on the userside
The swagwall comes to a form, but it loooks...........ugly ;)
Merge branch 'feature/Swagwand' into develop
New Git Ignor
Merge branch 'develop'
Swagwall added the output of the posts
some xml stuff
new git ignor
Added the Adzoneselements
Some litte things
Fort hässig
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'