Merge branch 'dev' of https://github.com/foxnet-es/book.selling into dev

Conflicts:
	src/js/server/book.selling.config.js
ReCommit
Merge branch 'dev' of https://github.com/foxnet-es/book.selling into dev

Conflicts:
	src/js/server/book.selling.config.js