conflict cleanup
commit project.properties
Merge pull request #61 from milneti/ViquocBranch

Viquoc branch