create project
clear auth
websocket code
finish oauth
get changed and post changed
Merge branch 'feature/oauth' into develop
Merge branch 'master' into develop

Conflicts:
	ShopExPrismSDK/AndroidManifest.xml
	ShopExPrismSDK/src/com/shopex/android/prism/MainActivity.java
	ShopExPrismSDK/src/com/shopex/android/prism/auth/PrismDialog.java
	ShopExPrismSDK/src/com/shopex/android/prism/network/INetworkAPI.java
	ShopExPrismSDK/src/com/shopex/android/prism/network/NetworkClient.java
	ShopExPrismSDK/src/com/shopex/android/prism/network/ShopExAsynchResponseHandler.java
Prism Demo and lib
Merge branch 'develop'