a
Merge branch 'develop' of https://github.com/KIDLY/KIDLY.git into
develop

Conflicts:
	src/XMLparser/Parser.java
get Final Img