initial ui test work
initial ui test work
fixed merge errors
UI tests
Merge changes
Fixed merge issues
fixed merge issues for uiutils.py
completed UI testing
undid formatting changes
undid more formatting changes
addressed questions in the pull request
addressed issues in pull request
python code refactoring
Merge branch 'master' of github.com:TheLastCrusade/SoundStream into testing

Conflicts:
	SoundStream/res/layout/menu.xml
	SoundStream/src/com/lastcrusade/soundstream/components/ConnectFragment.java
fixed indentation errors on menu.xml
new line in menu.xml
Merge branch 'master' of github.com:TheLastCrusade/SoundStream into testing

Conflicts:
	SoundStream/res/layout/menu.xml
userlist_fixes
added docstrings to methods and formatting
added new songs for ui testing