add pics
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/static_resources/images/btn_home2.png