volley merge
Merge branch 'master' of https://github.com/JLouback/Supnyc-android

Conflicts:
	app/src/main/java/com/example/julianalouback/supnyc/EventRecyclerAdapter.java
Merge branch 'master' of https://github.com/JLouback/Supnyc-android
api
fix
it's alive motherfucka