Added finish method call in startactivity and moved database
Merge remote-tracking branch 'origin/master'