update bootstramp
update css
update header in shop view
New changelist
Merge branch 'master' of github.com:allen2/jy
New changelist
Merge branch 'master' of github.com:allen2/jy
update shop view
New changelist
New changelist
New changelist
update shop view
Merge branch 'master' of github.com:allen2/jy

Conflicts:
	src/main/java/com/renren/ntc/sg/util/ReadExcel.java
add jquery and bootstrap