Merge remote-tracking branch 'origin/master'

Author: ishaileshmishra

.gitignore

@@ -15,6 +15,7 @@ bin/
 coverage/
 docs/
 tmp/
+report/
 *.tmp
 *.bak
 *.swp
@@ -23,6 +24,7 @@ local.properties
 .settings/
 .loadpath
 .recommenders
+.docache
 
 # External tool builders
 .externalToolBuilders/
@@ -267,3 +269,4 @@ src/main/resources/
 /.idea/
 /test-report/
 /.apt_generated_tests/
+.dccache