- pref screen, not saved yet
- just the pref screen
Merge branch 'master' of github.com:tonytamsf/AndroidYaFood

Conflicts:
	YaFood/res/values/strings.xml
	YaFood/src/com/tonyandollie/yafood/Station.java