Merged with eclipse and fixed Desktop project