using bootstrap, form localization, acceptence tests
delete comments and correct localization
fix conflicts
remove unnecesary link
remove '?' and set en locale
remove spec/lor
remove comments