- update of fronted of new branch
addition of node export modules
Merge branch 'develop' into frontEndUpdates

Conflicts:
	src/sites/all/modules/node_export/README.txt
	src/sites/all/modules/node_export/node_export.api.php
	src/sites/all/modules/node_export/node_export.pages.inc
	src/sites/all/modules/node_export/views/node_export.views.inc
	src/sites/all/modules/node_export/views/views_handler_field_node_link_export.inc
Merge pull request #22 from PopShack/frontEndUpdates

Front end updates