Updated
Merge branch 'master' of https://github.com/dangarbri/Random-Name-Generator-app

Conflicts:
	bin/classes/com/flyingsolo/randomnamegenerator/NameGenerator.class
	project.properties
	res/layout/activity_name_generator.xml
	res/menu/name_generator.xml
	res/values-sw600dp/dimens.xml
	res/values-sw720dp-land/dimens.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/flyingsolo/randomnamegenerator/NameGenerator.java

Update