resourceTypes parameter in general search should be array
WIP on bringing over activities widget to newframework
Use safeURL and safeUserInput in activity widget template.
Finish bringing the activity widget over to the new framework, fix an infinite scroll bug where lists in lists would confuse paging
Merge origin/newframework and fix conflicts
Redirect from the 502 error page to the me page if it is available again
Changed the function documentation to include why it is not using the oae api
getMe function
Follow up on PR review
Updated the function documentation
Added some documentation and line breaks
Merge remote-tracking branch 'origin/newframework' into 2634followup
Merge branch 'activity' of git://github.com/bp323/3akai-ux into activity
grunt 0.4 compatibility

Conflicts:
	package.json
grunt-git-describe task name changed

also, it needs a target now
Fixed bug in lists macro
Merge branch 'git-describe' of git://github.com/stuartf/3akai-ux into git-describ
Merge remote-tracking branch 'origin/newframework' into 2634followup
Follow up on pull/2634