Remove tmp file release.properties
Merge remote-tracking branch 'rt/master'

Conflicts:
	release.properties
Merge remote-tracking branch 'rt/master'
Merge remote-tracking branch 'rt/master'
changes for log
Merge remote-tracking branch 'origin/master'
make changes for log file