New code base incoming update to android studio .5.4. And three new librarys
New codebase tostart
Merge branch 'master' into V2

Conflicts:
	.idea/copyright/profiles_settings.xml
	.idea/gradle.xml
	.idea/modules.xml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	gradlew
	settings.gradle