Merge pull request #759 from sexnothing/develop

BS3 update
Imported search module
Code cleaning up
Comment module bs3 update