MEDIUM : removed use-less code
LOW : Local Merge of remote 1.7
LOW : Merging 1.7 remote branch februrary 23
LOW : some cleaning and moved some resources