AgrarTrade v 0.0.1 builtd 000009

añadido cambio
Merge branch 'master' of https://github.com/Operdata/AgrarTrade

Conflicts:
	css/Stylesheet.css
	css/menu/styles.css
	img/menu/icon_minus.png
	img/menu/icon_plus.png
	index.php
	js/data/dummy_file
	js/libs/angular.js/angular-resource.js
	js/libs/angular.js/angular.js
	js/scripts/script.js
	php/database_connection/dummy_file
	php/intern_files/dummy_file
	php/log_sistem/dummy_file
	sources/dummy_file
	templates/index_menu/index.html
Merge branch 'master' of https://github.com/Operdata/AgrarTrade