2014/08/23/16:52
2014/08/23/17:14
2014/08/25/10:45
2014/08/25/11:25
2014/08/25/14:04
release1.1.0 - 2014.08.25.14.09.33

Merge remote-tracking branch 'original/release-1.2.2' into release-1.1.0

Conflicts:
	Skein/src/main/webapp/WEB-INF/views/photo/viewlist.jsp
	Skein/src/main/webapp/resources/css/photo/viewlist.css