fixed
Merge branch 'master'
s
changed authentication to take acctype
added commit info
Merge branch 'master'