added true false back to the menu
added polloptions back to the project
Merge branch 'MCP-6_Clean' into master_fresh