adds ckeditor rake task
fixes ckeditor rake task
side nav url fix
Merge branch 'dev'

Conflicts:
	app/views/application/_side_nav.html.erb
	db/seeds.rb
arrega giladas css;
minor styling fixes
minor stuff
sign up devise problem fixed
init pundi
side changes
modifica rutas paginas
agrega posts
start pundit
Merge branch 'dev'

Conflicts:
	.gitignore
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	app/assets/stylesheets/general.scss
	app/views/application/_search.html.erb
	db/seeds.rb
Merge branch 'master' of github.com:farfanoide/agalma

Conflicts:
	app/controllers/application_controller.rb
	db/schema.rb