Hack
Merge branch 'master' of git://github.com/ami-lab/AmI-Platform