Merge pull request #3 from kidat/master

getting search started
pre-merge stash
Merge branch 'master' of https://github.com/BuckyFullerInst/BFI

Conflicts:
	www/sites/default/files/css/bfi.css
	www/sites/default/files/sasson/bfi-sprites/vert-sprite.scss
got rid of civicdm in database
removed old unnecessary entity folder
trying to figure out why deploy not working
fixing search result display, dropping body size, adding thin lines in sidebar
color box view of images at bottom of post and update
took out weird border thing for header logo image
no wait, this fixes it
fixing multi-image problem in sidebars
social icons + challenge architecture
tweaking image settings to allow insert
getting started with trimtab. AWWK
iteration 1 of trimtab. need to keep iterating.
adding Idea Indexee node type
product highlight not showing up in trimtab display
got trimtab to behave
Merge pull request #6 from BuckyFullerInst/master

TODO: Trimtab, CiviCRM, permissions