merge commit
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
merge commit
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
added wakelock to loginview
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
merge commit
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
merge commit
merge commit
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
removed audio network code
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
misc cleanup