Merge branch 'master' of https://github.com/bjsbl/Faster

Conflicts:
	WebRoot/com/app/index.jsp
	src/com/fast/core/base/BaseModel.java
	src/com/fast/core/db/table/RecordBuilder.java
	src/com/fast/core/db/table/SqlBuilder.java
	src/org/app/controller/LoginController.java
	src/org/app/model/User.java
Merge branch 'master' of https://github.com/bjsbl/Faster

Conflicts:
	WebRoot/com/app/index.jsp
	src/com/fast/core/base/BaseModel.java
	src/com/fast/core/db/table/RecordBuilder.java
	src/com/fast/core/db/table/SqlBuilder.java
	src/org/app/controller/LoginController.java
	src/org/app/model/User.java