did a dbinit, no changes done to schema
Merge remote-tracking branch 'ta/master'
Move rails to 4.0.1.rc2, paperclip 3.5.2, coffee-rails 4.0.1
Rails 4.0.1-rc3 now.
Merge remote-tracking branch 'ta/master'
no changes, but the dbinit modified a line to the same val.
Merge remote-tracking branch 'ta/master'
Add the text "Click here to view your Dashboard" in the angular file
changes
media links are changed

Conflicts:
	app/assets/javascripts/angular/templates/widgets/pernode/show.jst.ejs.erb
Add predef clouds page design
changes to gemlock
Cloud store changes
Merge remote-tracking branch 'origin'
node get by name change