add delete button, change layout (good or bad?)
add button image
Merge branch 'eneim' of https://github.com/eneim/abnomics.git into eneim

Conflicts:
	app/controllers/Application.java
	app/views/Application/home.html
Merge branch 'eneim' of https://github.com/eneim/abnomics into eneim
add li:hover
modify delete icon
on image click listerer added, showing an alert only
minor fix
Merge branch 'eneim' of https://github.com/eneim/abnomics into eneim

Conflicts:
	app/controllers/Application.java
	app/views/Application/home.html
change mkdir -> mkdirs (java 7 problem??)
fix minor upload bug
add colorbox support
layout bugs fixed
Merge branch 'eneim' of https://github.com/eneim/abnomics into eneim

Conflicts:
	app/views/Application/home.html
	app/views/Application/main.html
add photoviewer.html to show individual photo, add relative java method.
add user page
add style for photoviewer
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno into eneim

Conflicts:
	app/controllers/Application.java
fix header #2
fix header #3