Several changes
Android App
Android app with device list and basic edit
Appengine app with device listing, device editing and event view
Android App, several changes
Merge a conflict
Merge a conflict
Merge branch 'master' of https://bitbucket.org/jorge_salcedo/ardux

Conflicts:
	gae_app/ardux/views.py
	gae_app/settings.py
Ignoring secret keys
Separating settings and constants