Merge branch 'development'
Merge development into master for stable demonstration.
Merge branch 'master' of https://github.com/latreides/SE_Team3