update/format the code
updating code
Merge branch 'master' of https://github.com/vrvarma/felix_tutorial

Conflicts:
	xuggler/src/main/java/com/att/wifi/camera/FileUtils.java