Merge branch 'develop'
Maiking some small changes
Merge pull request #6 from TheRyanHowell/master

Pull Ryans code into my repo
Making things nicer
Merge branch 'develop' into feature/Settings_Update
Merge branch 'develop' into feature/Mail_Class

Conflicts:
	.core/modules/data/email.class.php
Merge branch 'feature/Mail_Class' into develop
Merge branch 'feature/Settings_Update' into develop
Merge pull request #8 from MobliMic/develop

Develop
Merge branch 'master' into develop