delete new Avatar
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
delete new Avatar
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
profile Edit
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git