Back to the track
Merge branch 'master' of https://github.com/nicolaeturcan/androidSkeletonBeta

Conflicts:
	res/values/strings.xml