Merging

Conflicts:

	lib/pkp
Merge pull request #87 from MichaelThessel/loginas

*8279* Re-introduced log in as functionality