Merge branch 'tjblonsk-master'

Conflicts:
	config/initializers/devise.rb
secret key config
changed spans on idea div
span editing in idea box
added styling to buttons