SMPT setup for development environment
Added instructions to setup smtp for dev env
Idea list counts in headers
Front page counts in headers

Conflicts:

	app/assets/stylesheets/application.css.scss
	app/controllers/pages_controller.rb
	app/views/layouts/application.html.haml
	app/views/pages/_drafts.html.haml
	app/views/pages/_headline.html.haml
	app/views/pages/home.html.haml
Front page idea examples with even separation dash lines

Conflicts:

	app/assets/stylesheets/pages.css.scss
Welcoming mail at registration (also FB)
Welcoming mail at registration (also FB)
Follow same page for fb signup as we have for email signup
Add ended campaigns state

Conflicts:

	app/views/ideas/show.html.haml
Stamp over headline

Conflicts:

	app/assets/stylesheets/pages.css.scss
	app/views/pages/_headline.html.haml
Made link for navigating to login page clickable on IE
Test Cases: Welcome email at registration.
Removed unneccessary spaces
Fixed branching issues
Fixed branching issues
Reset password link
Flash message on wrong creds, Forget password functionality

Conflicts:

	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/pages.css.scss
	app/views/citizens/sessions/new.html.erb
Moved styles to css files

Conflicts:

	app/views/shared/_login_actions.html.haml
Moved styles to css files

Conflicts:

	app/views/shared/_login_actions.html.haml

Conflicts:

	app/assets/stylesheets/application.css.scss
	app/views/citizens/sessions/new.html.erb
	app/views/shared/_login_actions.html.haml
Merge branch 'fix_ie_btn' into state_machine