html2canvas
Merge branch 'master' of https://github.com/AlinNereid/Drool

Conflicts:
	.idea/workspace.xml
continued work on rates