Revert "strings and framelayout"

This reverts commit 031c9ab1cba1034487fa73b58e80c68896a61088.
Revert "Revert "strings and framelayout""

This reverts commit 8d6e934052cd6f921a2e4cd27a379cd289833a50.
Merge branch 'master' of https://github.com/johnfonte/stredm-android