sample branch logos
Merge remote-tracking branch 'origin/develop' into vinh

Conflicts:
	src/main/java/com/jinnova/smartpad/common/sample/Sample2.java
	src/main/java/com/jinnova/smartpad/common/sample/SampleDataGenerator.java