New Changes
Updated proyect
Changes for Mac
ignore
Merge remote-tracking branch 'origin/fix-yosemite' into fix-yosemite

Conflicts:
	config.properties
	pom.xml
	src/main/java/TSTester.java
	src/main/java/TestSikuli.java
	src/test/java/TSSocialNetworkHtml5PreviewTest.java
ihnore
Merge remote-tracking branch 'origin/fix-yosemite' into fix-yosemite

Conflicts:
	config.properties
	pom.xml
	src/main/java/TSTester.java
	src/main/java/TestSikuli.java
	src/test/java/TSSocialNetworkHtml5PreviewTest.java
Rename File
The file name was changed
Copy code form remote repositiry
git ignore