Signed-off-by: levalidator <levalidator@gmail.com>
Signed-off-by: levalidator <levalidator@gmail.com>
Merge branch 'master' of https://github.com/availlant/7AC

Conflicts:
	WebContent/WEB-INF/tags/Layout.tag