added weather_user_obs widget
removed .DS_Store
updated admin.less, buttons.less, header.less, profile.less, tabs.less, typography.less and some en.php files.
fixed merge conflicts
Fixed api bug. Kudos to travis for noticing.
force a persistent login. This will allow the is_logged_in rest call to work consistently
remove editor removed, mce put back on discussion edit page
hiding embed menu from longtext in investigation edit page
updated rest api for agg requests and fixed some bugs
fixed a few things
dealing with merge conflict
Modified: obobservation-detail.less, observations.php, admin.less, buttons.less, graph.css, profile.less, typography.less, exploredata.php / New: rd_corners.less, tabs.less
added in get likes by agg id
Fixed conflicts with: admin.less, buttons. less and typography.less
table implementation
Merge branch 'weatherblur' of github.com:noelmiciano/Elgg into weatherblur
removed psds
Merge pull request #4 from scott-stewart-nbt/weatherblur

table implementation
Merge branch 'weatherblur' of github.com:NBTSolutions/Elgg into weatherblur
modified: user-stat-icons.png, discussion_block.less, discussion_detail.less, inv.less, list-block.less