changed cookie time for user-login again, and fixed parsing of more info from log_excerpt
fixed PAPI.save that should have been PAPI._save
added AND logic in Search fields on users app
Merge remote-tracking branch 'upstream/master'
updated bundle update
added skeleton for Content app
ocean-rails 2.9.0
bundle udpate ocean-rails 2.4.1
added correct domain to config.yml.example
test commit
ocean-rails 2.9.0
2.6.0
back to 2.4.1
added content app bare bones
added rendering of creation of BroadcastCards
Content - added hidden swarms that is toggleable, changed style and upgraded to latest OceanFront using new objects such as Delimiter
Content - added Delete button to cards
Content - Now working to create and delete broadcasts and swarms
changed rendering of Swarms
added id rendering and more styles etc