just before initial version
Merge remote-tracking branch 'origin/master'

Conflicts:
	ring-server/src/main/java/tr/com/t2giants/ring/server/dao/jdbc/UserDaoJDBCImpl.java