Merge branch 'master' of https://github.com/xkrogen/wuff

Conflicts:
	wuff_frontend/wuff_frontend/MainViewController.m
Merge Resolution
Merge branch 'master' of https://github.com/xkrogen/wuff