ignore ds_store
using dev
sync
+redis code
Merge branch 'dev'

Conflicts:
	pom.xml