new style
new style
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/misc.xml
	widget/src/main/AndroidManifest.xml
	widget/src/main/java/com/alexeyk/motivation/widget/MotivationWidget.java
	widget/src/main/res/xml/motivation_widget_info.xml
	widget/widget.iml
new style