commit
Merge branch 'master' of https://github.com/yyyar/SuperAds

Conflicts:
	src/main/java/Application.java