Test 07/10/2014

Test for first time Using GitHub
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/SiccoApp/.classpath
	Source/SiccoApp/project.properties
	Source/SiccoApp/src/com/sicco/erp/LoginActivity.java