more idea board changes
merge conflic fixes
Merge pull request #48 from jpsiepert/master

Idea Board Stuff