added wavesurfer
update themes stuff
Adding theme stuff
Added fonts stuff
testing commit
split up template files
Added IntelliJ files to gitignore
removing legacy blocks
Merge branch 'ui' of https://github.com/ClockworkNet/cwfm into ui
merging overall layout from themes
fixing illegal continue line 27
Adding default avatar image and config value.
Added music preloader
work on queue theme
Getting left column in order
Adding data/music directory.
Merge branch 'ui' of https://github.com/ClockworkNet/cwfm into ui

# By Micah
# Via Micah
* 'ui' of https://github.com/ClockworkNet/cwfm:
  work on queue theme
  fixing illegal continue line 27
  merging overall layout from themes

Conflicts:
	views/room.jade
no changes
Fixed hiding user control.
Merge branch 'dev' of https://github.com/ClockworkNet/cwfm into dev