Remove empty helpers. See http://rails-bestpractices.com/posts/72-remove-empty-helpers
Simplify render in controllers . See http://rails-bestpractices.com/posts/62-simplify-render-in-controllers
Fix for simple_form deprecation errors. See http://blog.plataformatec.com.br/2012/02/simpleform-2-0-bootstrap-for-you-with-love/
Complete rspec for Dictionary and Label models.
Complete rspec for Dictionary and Label models.
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/models/admin/label_spec.rb
Complete rspec for Dictionary and Label models.
Merge remote-tracking branch 'origin/master'
Complete rspec for Dictionary and Label models.
Merge remote-tracking branch 'origin/master'
new logo
Merge remote-tracking branch 'refs/remotes/origin/master'
Temporary hide bad image of logo
Merge pull request #34 from amikhile/master

adding visible scope to catalogs
Catalogs: return nil if requested catalognodeid if wrong
Homepage (excluding catalogs)
Homepage - assets pipeline
proper time calculation
Super Logo
cover audio image - temp