ProGuard upgraded to 5.0
Merge branch 'develop'