before pull, 20141105
Merge branch 'master' of https://github.com/alalei/PopAPPExperiment

Conflicts:
	src/com/example/popappexperiment/CloseButtonService.java
add feature about moving button