working on iOS7 comp
complete the merge
merging some stuuuf
timer works pwd functions well