Merge branch 'master' into dev
+55555555
Merge branch 'master' into dev

Conflicts:
	readme.txt
Merge branch 'dev'