adding several files. inser poll added.
updating poll.
fix s
Merge origin/master

Conflicts:
	views/zenpage.php