removed hardcoded credentials
Merge branch 'development' into oauth