Finish view order!
Merge branch 'master' of
https://github.com/gjq1218/ducking-octo-bugfixes.git

Conflicts:
	src/struts.xml