Generic Portal

merged xsce master to my github and local master
merged local master to local portaltfm, resolving one conflict
pushed local portaltfm to github
ready for merge back to xsce master