add
update
Merge branch 'master' of https://github.com/jugo8633/InteractiveReader

Conflicts:
	InteractiveView/src/interactive/view/animation/zoom/ZoomHandler.java