DEV changes
Feature 001
Feature 001
Feature 002
Feature 002 more
Merge branch 'feature/feature-001' into develop

Some Fixes Feature 001
Merge branch 'feature/feature-002' into develop

Conflicts:
	file.text
Release 1.0
Merge branch 'release/1.0'

Release 1.0
Fixed HotFix Server Down
Merge branch 'hotfix/server-down'
Saving the world again
Fixed HomePage Issue
Merge branch 'hotfix/homepage-issue'