Icons
Merge branch 'master' of github.com:filipstachura/memelon

Conflicts:
	.meteor/local/cordova-build/platforms/android/ant-build/res/drawable-hdpi/icon.png
	.meteor/local/cordova-build/platforms/android/ant-build/res/drawable-ldpi/icon.png
	.meteor/local/cordova-build/platforms/android/ant-build/res/drawable-mdpi/icon.png
	.meteor/local/cordova-build/platforms/android/ant-build/res/drawable-xhdpi/icon.png
	.meteor/local/cordova-build/platforms/android/ant-build/res/drawable/icon.png