Merge branch 'platfrom'
switched timer to uth namespace, modified some function names, switched compiler macros
Merge branch 'master' into platfrom