Start MAP
Merge branch 'master' of github.com:TomPeerdeman/AEC2013