Timeline
Merge commit '8327b066f6ee81284f07aed89ae423e333288bfc' into develop

Conflicts:
	android/LombaApp/src/lomba/app/CalegActivity.java
ui changes
put frame on photo and change bitmaps