project properties for merge
Merge branch 'master' of https://github.com/TuttiFruttiFT/TFAndroid
login layout fix