uncommited changes
Merge branch 'development' of https://github.com/jessejohnson/flippy into development
layout changes
Merge branch 'development' of https://github.com/jessejohnson/flippy into development

Conflicts:
	Flippy/.idea/libraries/cropper_1_0_1.xml
	Flippy/app/app.iml
Merge branch 'development' of https://github.com/jessejohnson/flippy into development
.
Merge branch 'development' of https://github.com/jessejohnson/flippy into development
.
removed elevation from listView, updated settings