Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
add init demo account operation
Merge branch 'Development'

Conflicts:
	.gitignore
	app/com/shopservice/refreshers/PriceFormatRefresher.java
Merge remote-tracking branch 'origin/master'