working on ui.. dammit!
Merge branch 'master' of https://github.com/ProjectFF/ProjectFF

Conflicts:
	com.projectff.main/.classpath
	com.projectff.main/src/com/projectff/main/MainAcrivity.java

Resolved!