composer
Merge branch 'master' of http://github.com/FoxSis/foxapp

Conflicts:
	bin/composer.phar
desenvolvimento da classe de status
[UPDATE]
  - versao do daniel
[ADD]
  - tema do windows
[UPDATE]
  - agora está com o bootstrap 2
Merge branch 'master' of https://github.com/FoxSis/foxapp

Conflicts:
	src/InteliHelp/TaskBundle/Entity/Status.php
Merge branch 'master' of https://github.com/regisnew/foxapp
[UPDATE]
  - alteração do layout para o novo modelo METRO
Merge pull request #6 from dsousap/master

Layout