these are the original files from the version amkn.org
first version amkn.org
the merge was made successfully
deprecated function
Merge branch 'dev' of https://github.com/CCAFS/AMKN
Merge branch 'dev'
merge dev
mistake merge dev
correction CCAFS Sites baseline survey

If bs_description is empty, the link won't be shown
Data & tools

The platforms was classificated
Merge remote-tracking branch 'origin/dev'
CCafs Sites
Tree render
Merge remote-tracking branch 'origin/dev' into dev-design

Conflicts:
	wp-content/themes/amkn_theme/dataAndTools.php
	wp-content/themes/amkn_theme/functions.php
	wp-content/themes/amkn_theme/header-home.php
	wp-content/themes/amkn_theme/home.php