Testing travis.
Merge branch 'develop' into va/env-specific-configs
Merge branch 'develop' into va/env-specific-configs
Removed pom.xml as we are not going to use maven in near future.