Merge branch 'develop' into develop2
Merge branch 'develop2' of github.com:Jaspersoft/js-android-app into develop2
Merge branch 'develop2' of github.com:Jaspersoft/js-android-app into develop2