Make compatible with java 6
Update iml files
Implement history sync