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
updated rest api for agg requests and fixed some bugs
fixed a few things
dealing with merge conflict