Signed-off-by: Grinch <comfymobile@gmail.com>
Merge branch 'master' of https://github.com/JSTOo/saper_app.git

Conflicts:
	src/com/comfymobile/saadat/activity/EventActivity.java
	src/com/comfymobile/saadat/database/LocalDatabase.java

Signed-off-by: Grinch <comfymobile@gmail.com>
Merge branch 'master' of https://github.com/JSTOo/saper_app.git

Conflicts:
	src/com/comfymobile/saadat/activity/EventActivity.java
	src/com/comfymobile/saadat/database/LocalDatabase.java

Signed-off-by: Grinch <comfymobile@gmail.com>
Signed-off-by: Grinch <comfymobile@gmail.com>