Changes made by Johannes Mueller (m_johannes@hotmail.com).
Changes made by Johannes Mueller (m_johannes@hotmail.com).
Changes made by Johannes Mueller (m_johannes@hotmail.com).
Merge branch 'master' of https://github.com/swensk/Design.git

Conflicts:
	Design/Inbox.html
	Design/Settings.html