19.07.2014.
Merge branch 'master' of https://github.com/babazumbula/StickerExchange

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/stickerexchange/R$drawable.class
	bin/classes/com/example/stickerexchange/R$id.class
	bin/classes/com/example/stickerexchange/R$integer.class
	bin/classes/com/example/stickerexchange/R$layout.class
	bin/classes/com/example/stickerexchange/R$menu.class
	bin/classes/com/example/stickerexchange/R$string.class
	bin/classes/com/example/stickerexchange/R$style.class
	bin/classes/com/example/stickerexchange/R$styleable.class
	gen/android/support/v7/appcompat/R.java
	gen/com/example/stickerexchange/R.java
	proguard-project.txt
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
	res/menu/main.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values-w820dp/dimens.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml