pull
Merge branch 'master' of https://github.com/mholtzscher/askdroid

Conflicts:
	AskDroid/bin/AskDroid.apk
	AskDroid/bin/classes.dex
	AskDroid/bin/classes/edu/nwmsu/askdroid/DefinitionActivity$1.class
	AskDroid/bin/classes/edu/nwmsu/askdroid/DefinitionActivity.class
	AskDroid/src/edu/nwmsu/askdroid/DefinitionActivity.java
Merge branch 'master' of https://github.com/mholtzscher/askdroid

Conflicts:
	AskDroid/bin/AskDroid.apk
	AskDroid/bin/classes/edu/nwmsu/askdroid/DefinitionActivity.class
	AskDroid/bin/resources.ap_
Merge branch 'master' of https://github.com/mholtzscher/askdroid
Merge branch 'master' of https://github.com/mholtzscher/askdroid
Merge branch 'master' of https://github.com/mholtzscher/askdroid
Merge branch 'master' of https://github.com/mholtzscher/askdroid
Merge branch 'master' of https://github.com/mholtzscher/askdroid
work
Merge branch 'master' of https://github.com/mholtzscher/askdroid
Support for spaces
Merge branch 'master' of https://github.com/mholtzscher/askdroid