много всего
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/financial/pyramid/web/AdminTabsController.java
	src/main/java/com/financial/pyramid/web/TabsController.java
merge