Keep uniform test messages for all the test
Merge pull request #377 from sguada/fix_initial_test

Keep same format for all net testing log messages
note the last added layer/params in caffe.proto to prevent conflicts

The current scheme does not actually prevent conflicts, since three-way
merge will accept simultaneous changes that agree on the next number.
This commit fixes this by explicitly noting the last layer added.
Merge pull request #378 from longjon/no-merge-duplicates

Note the last added layer/params in caffe.proto to prevent conflicts
Merge remote-tracking branch 'upstream/dev' into dev
Merge branch 'dev' of https://github.com/s9xie/caffe into dev

Conflicts:
	src/caffe/proto/caffe.proto