<language> tag missing
Merge branch 'master' into Frodo
MypicsDB class introduced
Merge branch 'Frodo'

Conflicts:
	resources/lib/MypicsDB.py