modified:   CMakeLists.txt
	modified:   README.md
	modified:   tsupdate
	locale/cs.qm
	locale/jp.qm
	locale/sv.qm
	translations/cs.ts
	translations/jp.ts
	translations/sv.ts
Merge branch 'master' of https://github.com/EdzeronK/QGifer into dev

Conflicts: