add flash to layout
resolve conflicts
Merge branch 'develop' of github.com:vishal-webonise/geekhours-whatsay into develop

* 'develop' of github.com:vishal-webonise/geekhours-whatsay:
  poll models created. TODO type polls fields yet to be decided
  after login page added
  log files deleted