update ignore
update igore
update gitignore
Merge branch 'master' of github.com:liangji101/jy

Conflicts:
	.gitignore
Merge branch 'master' of github.com:allen2/jy
Merge branch 'master' of github.com:allen2/jy
update sql
Merge branch 'master' of github.com:allen2/jy
add appframework for html5 page
remote appframw work
update bootstramp
update css
update header in shop view
Merge branch 'master' of github.com:allen2/jy
Merge branch 'master' of github.com:allen2/jy
update shop view
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
Merge branch 'master' of github.com:allen2/jy

Conflicts:
	src/main/script/create_database.sql