using bootstrap, form localization, acceptence tests
delete comments and correct localization
fix conflicts