Updated filelist
Merge pull request #2 from HybridAir/propertiesImplementation

Updated filelist
updated
Merge master into twitterImplementation

Conflicts:
	.gitignore