oauth testing
Merge branch 'master' of https://github.com/jcapoduri/C2Si-blackfeather

Conflicts:
	server/api/index.php
para merguear
Merge branch 'master' of https://github.com/jcapoduri/C2Si-blackfeather
oauth added