added countries action
fixed action name
fixed get countries
modified expected test file for countries
fixed get_countries sql
updated expected get countries result
added more detail into the achievements for member stats
Added GET Basic User Profile
Updated the design/challenges/{id} api to match what is currently in prod and also added more data in the response to accommodate the checkpoints, submissions, and winners.  Also added some more fields for the overview page.
Updated develop/challenges/{id} to match current prod.  Also added checkpoint feedback data.
Transferring blueprint from apiary.io
added introduction to design/challenges/id
added technology to software response
Merge pull request #41 from mekanizumutc/fix_country_code

Added new action 'countries' for API /v2/data/countries
add docs for countries api
fix docs for countries api
line endings
Merge branch 'master' into jdbc-driver

Conflicts:
	package.json
	test/sqls/contests/data/software-active-contests.part1.sql
	test/sqls/contests/data/software-active-contests.part2.sql
	test/sqls/contests/data/software-active-contests.part3.sql
	test/sqls/contests/data/software-active-contests.part4.sql
	test/sqls/contests/data/software-active-private.part1.sql
	test/sqls/contests/data/software-past-contests.part1.sql
	test/sqls/contests/data/software-past-contests.part2.sql
	test/sqls/contests/data/software-past-contests.part3.sql
	test/sqls/contests/data/software-past-contests.part4.sql
	test/sqls/contests/data/software-past-private.part1.sql
	test/sqls/contests/data/software-upcoming-contests.part1.sql
	test/sqls/contests/data/software-upcoming-contests.part2.sql
	test/sqls/contests/data/software-upcoming-contests.part3.sql
	test/sqls/contests/data/software-upcoming-contests.part4.sql
	test/sqls/contests/data/software-upcoming-private.part1.sql
fixed countries expected data
update ci database ip