change before 11/04/2014
Merge branch 'master' of https://github.com/Choonster/AMS.git