Merge branch 'dev'
Bump server dependencies (Aleph 0.3.0-beta13, Aloha 1.0.2)
Aleph config tweaks
Update 'Pending changes' in README