reorder and fix js & css includes
add casperjs individual test runner script
Merge branch 'dev' of github.com:lintubongarit/sulka into dev

Conflicts:
	src/main/webapp/WEB-INF/views/addRecoveries.jsp
	src/main/webapp/WEB-INF/views/addRingings.jsp