window
Merge branch 'master' of https://github.com/Synature-Jitthapong/piz_q
Merge branch 'master' of https://github.com/Synature-Jitthapong/piz_q

Conflicts:
	project.properties
update
update