testc
Merge branch 'master' of https://github.com/nineunderground/filmophon

Conflicts:
	filmophon/src/com/main/filmophon/FilmophonUI.java