TargetApi declared
Merge remote-tracking branch 'origin/dev' into michael
TargetApi added
Merge remote-tracking branch 'origin/dev' into michael
SuperActivity added, NewMap edited
Deleted unused content
bug fix in manifest