Merge branch 'dev' of https://github.com/tinhtooang/balloonatic into dev

Conflicts:
	src/Handlers/ScrollingHandler.java