Merge pull request #5 from flymke/dev

Dev
Merge pull request #6 from flymke/dev

Fixed formatting and typo
Merge branch 'dev'
Merge pull request #7 from flymke/dev

Default Colors, Save Message
Merge branch 'dev'
Merge pull request #8 from flymke/dev

bugfix
Localization fixes
Update localization
Merge pull request #9 from flymke/translation

Update localization
Merge branch 'master' of https://github.com/flymke/mark-posts
Merge branch 'dev'

Conflicts:
	admin/views/admin.php
Merge branch 'master' into dev
Merge conflict