edit
merge
Merge branch 'master' of https://github.com/Sortivo/sklikapi.git

Conflicts:
	src/main/java/cz/sortivo/sklikapi/AdDAO.java
	src/main/java/cz/sortivo/sklikapi/KeywordDAO.java