StockInfo Module Prototype Complete
Merge branch 'guster' of 192.168.0.3:tan-chong/sa into guster

Conflicts:
	src/com/guster/nissan/activity/StockInfoActivity.java
	src/com/guster/nissan/util/StockDataService.java
	src/com/guster/nissan/util/StockInfoService.java
	src/com/guster/nissan/web/StockDataService.java
Revert "StockInfo Module Prototype Complete"

This reverts commit d76033ed739a4296b574524a1001e943489e443e.
Resolved Conflict Issues Commit
Before swaping location and color edit
Revised Main Menu and Stock Info
Merge branch 'guster' of 192.168.0.3:tan-chong/sa into guster

Conflicts:
	res/values/colors.xml
	src/com/guster/nissan/activity/MainActivity.java
	src/com/guster/nissan/fragment/MainFragment.java
	src/com/guster/nissan/fragment/StockDisplayFragment.java
	src/com/guster/nissan/fragment/StockListFragment.java
Color theme change to all green