Convert All Text File as UTF-8 (2)
Merge branch 'master' of github.com:xuserv/iBeatConAndroid

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Add Restart on Settings