Modify .gitignore
Clean workspace.xml
Merge branch 'master' of https://github.com/romapsih/Master

Conflicts:
	.gitignore
	.idea/workspace.xml
 - Add heatMapGreen;
 - Change double (x,y) to long;
 - change UI (map height, button inline);
 - change point radius.