Merge branch 'feature/debug-travis-failures' into feature/ruby-1.9

Conflicts:
	test/unit/authenticated_user_test.rb
remove last remainders of machinist

Machinists #plan is FactoryGirls attributes_for
fix login length hack in factories
fixed account controller test - we now actually verify the email format

So quire@localhost is invalid now
ensure we are using the latest JSON and use it in Active::Support

OKJson does not parse utf8 correctly.
latest json is not vulnerable to
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58
ruby 1.9: fixing entities controller - String#any? changed
no more any extend - use present? and presence instead
replaced any? with present? where it's applied on a string

''.any? returned true before.
ensure unauthenticated users can't touch wiki locks
more any? -> present? conversion
put upload_data on a separate line
uploading smaller gears file instead of photo.jpg for testing
special setup for testing file uploads on travis
also testing factory girl as an option now
test helper and factories ready for file upload
cleaned up file upload test so we can keep it around
fixing tests
Merge branch 'develop' into feature/ruby-1.9

Conflicts:
	Gemfile.lock
	app/views/layouts/context/_banner.html.haml
	app/views/layouts/local/page/_title.html.haml
	app/views/layouts/local/sidebar/_index.html.haml
resolving conflicts between ruby 1.9 and new css code
also require sass in test - cleanup Gemfile a bit