div stuff

Signed-off-by: boysen <proff@hotmail.com>
Merge branch 'master' of https://github.com/Vallle/timeline-gamified.git

Conflicts:
	src/com/bjorsond/android/timeline/ReflectionActivity.java