updated android-support-v4 to r18
Merge remote-tracking branch 'origin/masconsult-master' into HEAD