update layout.tpl See merge request !6
Master See merge request !5
verison See merge request !4
Master See merge request !3
Master See merge request !2
# Conflicts: # Application/Common/Conf/config.php
to release See merge request !1
