fix emergency bug-001.
fix emergency bug-002.
feature B 001.
feature B 002.
feature A 001.
feature A 002.
Merge branch 'hotfixes' into dev
Merge branch 'feature-A' into dev
Merge branch 'feature-B' into dev

Conflicts:
	restservice-test/src/main/resources/readme.txt