update oauth service
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/homeinns/web/controller/ResourceController.java
update oauth service
update oauth service
update oauth service
update oauth service