Adding card view test
Merge branch 'master' of github.com:blazsolar/FlowLayout

Conflicts:
	FlowLayoutExample/build.gradle
Cleanup
Merge branch 'master' into develop
Fix unspecified height measurment fixes #4