test
plz
All field ok--
Form ok--
Merge branch '6.x-1.x' into 6.x-1.xdamien
Resolved conflicts???

Conflicts:
	tripal_feature/tripal_feature.module
Merge branch '6.x-1.x' of https://github.com/mdondrup/tripal into 6.x-1.xdamien