tag/TagPhotoRelation model
nickname
a
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
edit upload path
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno
edit nickname in header
modify photoviewer css/html
make follower_page bases
minor bug fix
spell miss
Merge branch 'nikaido2'

Conflicts:
	app/controllers/Application.java
	app/models/User.java
あげ忘れ
fix style of photoviewer
serch by tag name
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
revert
css
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno into eneim