Merge branch 'master' of github.com:kaid/small-team-km-server
Merge branch 'master' of github.com:mobile-km/small-team-km-server

Conflicts:
	app/models/data_list.rb