wrong again

wrong again
fds

fsdafsad
das

fasd
merge

merge
Merge remote-tracking branch 'origin/master' into rtong
asf
igore
finish transmission from javascript to java
add Play2WarPlugin
bb
gg
123
123321
delete us-state.xml

complete!
empty form handler completed
??
1

1
merge with bohan

merge with bohan
merge to master

merge to master
Merge branch 'master' into rtong

Conflicts:
	.target/IntegrationTest$1.class
	.target/IntegrationTest.class
	.target/models/Course.class
	.target/models/entities/ECourse.class
	.target/views/course_list.scala.html
	app/controllers/CourseController.java