merge commit
Merge branch 'guster' of https://github.com/gusterwoei/Nissan into guster
pc pull commit
Merge branch 'guster' of https://github.com/gusterwoei/Nissan into guster

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	Nissan.iml
	gen/com/guster/nissan/BuildConfig.java
Migrating Stockinfo/Pricelist from activity level to fragment level