Bringing ami-crunch-02 into the game:)
Merge branch 'master' of github.com:ami-lab/AmI-Platform