Still use page_display.tpl for pages.
Copy paste from one terminal to another changed tab to whitespace.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php
Merge remote-tracking branch 'upstream/master'
Some sys chan stuff
xref
Achievements
Ooops, also update the DB
Must have broken that in a merge - put it back
Style
Merge pull request #250 from beardy-unixer/master

Various bits
Merge pull request #249 from cvogeley/master

New modal dialog for item expiry
js functions behind quick permission links were lost in comanchification process - because the js didn't get relocated to the new connedit module
Merge https://github.com/friendica/red into zpull
clean up sys_channel creation so it will work
add ability to set created date/time from the api
let's confront this "social network" elephant in the room head on rather than try to sweep it under the rug.
proof-read
more proof-reading
make xref work