Revert "Removed Nook and Amazon Market Strategies"

This reverts commit 5cc5dd9b0da730193f10dd0ce4b5a1a05c3cbfb4.

Conflicts:
	astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Removed missing target from build script