changed package name
Merge remote-tracking branch 'origin/master'

Conflicts:
	2DWaterPlane/gen/com/waterapps/waterplane/BuildConfig.java
	2DWaterPlane/gen/com/waterapps/waterplane/Manifest.java
	2DWaterPlane/gen/com/waterapps/waterplane/R.java