merge develop
Merge develop with added fixtures
not emacs
Merge branch 'develop'
Merge branch 'develop'
Added NestedForms and custom form type
Added event (sitemap)
merge develop
Merge branch 'master' into develop
Fixed DataFixtures
Added tests