android specific merges
add angularJs tutorial step 5