property changes
getting the git ready for merging
orgunit test changes from directory to packages
updating git ignore
merged from mauryaschanges using ours