updating to gradle 2.1
simplifying an event construction
Merge branch 'feature/upgrade-gradle' into develop