Removed warning
iOS6.1+
Merged with master
Merged Assets
Removed file not used