eliminate Cropper conflicts with jQuery
remove some now-unnecessary templates
Merge pull request #689 from fermionic/20130601-cropper-frost-fix

Modify Cropper to avoid conflicts with jQuery
forgot to update Frost autocomplete JS location
Merge pull request #690 from fermionic/agpl-20130604-frost-js-crash

forgot to update Frost autocomplete JS location
ostatus completion of threads now works with longer threads well.
Merge remote-tracking branch 'upstream/master'
Merge pull request #691 from annando/master

OStatus autocompletion improved
uimport: set contacts 'avatar-date' to zero. should fix issue #692
Merge pull request #693 from fabrixxm/moveme

uimport: set contacts 'avatar-date' to zero
don't try to parse empty xml with simplepie, throws conversion warning
Merge https://github.com/friendica/friendica into pull
move html from paginate functions to template
OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it
API: It is now possible to fetch only posts from one thread.
API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming.
CS: update to the strings
NB_NO: update to the strings
IT: update to the strings
ZH-CN: update to the strings
Merge pull request #695 from fabrixxm/master

move html from paginate functions to template