home work
Merge branch 'v0.0.2' of https://github.com/kkonyshev/salanal into
v0.0.2

Conflicts:
	salanal-web/spring.log
	salanal-web/src/main/java/ru/salanal/web/controller/AbstractController.java
	salanal-web/src/main/java/ru/salanal/web/controller/CityController.java
	salanal-web/src/main/webapp/WEB-INF/view/footer_complex.jsp
	spring.log

	
Abstract datatables