20130413
Merge remote-tracking branch 'wip1/master'

Conflicts:
	src/com/ks/stockquote/MainListActivity.java