Merge branch 'master' of C:\Users\user\WebstormProjects\masion_IOTWEB-2014-08-12 with conflicts.