Move properties files into phing folder
Merge remote-tracking branch 'origin/master'
Move properties files into phing folder
Remove project modules from makefile
Add github tracking part into the thesis
Merge remote-tracking branch 'origin/master'