Twitter setup busy shifting it to settings
Merge branch 'master' of https://github.com/tinkie101/SmartDoor

Conflicts:
	Source/gen/za/co/zebrav/smartdoor/R.java
	Source/res/values/strings.xml
	Source/src/za/co/zebrav/smartdoor/MainActivity.java