hung: 9:24 15/12/2014 at Softech
Hung: home
Hung: image backup 5:44 CH 16/12/2014
Hung: edit call
Merge origin/master into temp

Conflicts:
	nbproject/project.properties
Hung: version 7:02PM 19:12
Merge pull request #1 from kaijava/temp

Temp