cleanup
Merge branch 'master' of https://github.com/Xycl/plugin.image.mypicsdb

Conflicts:
	resources/lib/MypicsDB.py
Merge branch 'master' of https://github.com/Xycl/plugin.image.mypicsdb