Adding bootstrap styles
removing smarty
Merging from remote