version 1.0.3
Merge branch 'dev'

Conflicts:
	gradle.properties
	templates/android/build.gradle
	templates/iOS/build.gradle
version 1.0.4
Merge branch 'dev'
Merge branch 'dev'
1.0.5
1.0.6
1.0.6 - templates
Merge commit '14b79'

Conflicts:
	gradle.properties
template version
template version
merge with dev
Merge branch 'dev'
merge with dev
apphance - better artifactoy testing
merge with dev
-fixed jquery links
-fixed jquery links