Merge develop into master

Jakub Pelczar · Jakub Pelczar · commit 9942b51e1613 · 2016-01-14T12:12:18.000+01:00
diff --git a/library/src/main/java/pl/sigmapoint/customview/CustomButton.java b/library/src/main/java/pl/sigmapoint/customview/CustomButton.java
@@ -278,6 +278,7 @@ public int getMinimumHeight() {
 
     @Override
     protected int getSuggestedMinimumHeight() {
+
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 48, getContext().getResources().getDisplayMetrics());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,7 @@ public int getMinimumHeight() {`
`278`	`278`
`279`	`279`	`@Override`
`280`	`280`	`protected int getSuggestedMinimumHeight() {`
	`281`	`+`
`281`	`282`	`return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 48, getContext().getResources().getDisplayMetrics());`
`282`	`283`	`}`
`283`	`284`