Override things
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/hu/infostyle/parsedotclasspath/propertyfileutil/PropertyUtil.java
Working android application build script generating