data save
Merge branch 'data_save'
daily limit
Merge branch 'daily_limit'
data save
Merge branch 'fix/daily_save'
implement init view on tariff settings screen
fix date picker
implement save date
fix date reading
Merge branch 'settings'

Conflicts:
	src/com/devindi/traffic/data/DataManager.java
Merge branch 'settings'

Conflicts:
	src/com/devindi/traffic/data/DataManager.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   res/layout/activity_tariff.xml
#	modified:   src/com/devindi/traffic/activity/TariffSettingsActivity.java
#	modified:   src/com/devindi/traffic/data/DataManager.java
#	modified:   src/com/devindi/traffic/dialog/DatePickerDialogFragment.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   .idea/copyright/profiles_settings.xml
#	modified:   .idea/libraries/android_support_v4.xml
#	modified:   .idea/vcs.xml
#	modified:   src/com/devindi/traffic/data/DataManager.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/workspace.xml
#	out/
fix date view
save settings improve. fix daily quote
fix daily stat
Merge branch 'feature/daly_stat'
implement text on main screen
Merge branch 'gui/text'
implement info view
Merge branch 'gui/info_view'