deleted:    app/assets/javascripts/admin/pixel-admin.min.js
	modified:   app/controllers/admin/invoices_controller.rb
	modified:   app/controllers/admin/tickets_controller.rb
	modified:   app/models/product.rb
	modified:   app/models/service.rb
	modified:   app/views/admin/products/_form.html.erb
	modified:   app/views/admin/services/_form.html.erb
	modified:   app/views/admin/tickets/_form.html.erb
	new file:   db/migrate/20140708134424_add_cost_to_services.rb
	new file:   db/migrate/20140708153339_add_featured_to_products.rb
	modified:   db/schema.rb
fix photos
	deleted:    app/assets/stylesheets/froala_editor.css
fix
more gallery work
	deleted:    app/assets/javascripts/social/JavaScript-and-jQuery-jun-2014.zip
add galleries to public route
fix
fix messages and added threading
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/user.rb
Fix user
Merge remote-tracking branch 'upstream/master'
fix
fix populate.rake
Merge remote-tracking branch 'upstream/master'