bootstrap validator doesn't work :(
Merge origin/master